Fixed install issues