Fix first run errors