Fix issues installing instances on Mac OSX