Fix issues during install