Misc, and fixes