Fixes to go live