Fixes to firstrun