Installer fixes

Look into rewrite bug