Installation bugs fixed