Fix bugs after first clean install