Fixes for initial go live