Installer Fixes

A couple of installer fixes.