Added a couple fixes to installation script