Misc install bug fixes