some fixes on 'FirstRun stage'