- Fixed issues on clean install