Get things building and running on Mac again