Modifications reenabling OSX compiliations