Fixes for fresh start