Installation script fixes