Some more installation bugs fixed