Installation process fixes