more fixes for installer