Further build fixes

(no idea how this works fine on OS X)