Fast fixes to get online in clean state