Updates to functional support on OSX