Urgh, end of day rushing around trying to get things pushed before it gets lost.  I'll fix both of these, what a nightmare, sorry for the terrible PR in this case.