FIX: OS X issues