Buildfix for Mac/etc.