Various last minute fixes and tweaks