More fixes to go live