Cleaning up a bit, making it work with of_v0.7.4_osx_release