Installer fixes

Fixes for issues #377 and #376