Installation bugs removed