installer - fixing a few edge cases