MacOSX Fixes
@n1t0 should build!