Fixed some new issues with installer