Even more fixes for installer