OSX fixes

Thank you!!! 
Looking it over.