Fixes for initial run