Fixed install bugs