Fixes issues for clean first install