Changes to get working on mac.
Temp for fix.