Made some minor changes for installation