fixes for first run