Installer Bug Fixes