Fix definitions on Mac OS X
fix
tweak