Installer Fixes  and small corrections