Misc last-minute fixes