fixes for initial run