Regain OS X compatibility