both are now fixed in my po branch.