Lot of little fixes - not sure how they slipped in.