Fix issues with installation