WIP: fix osx build?