Misc fixes from Craig's testing