FIX: Fixes for OSX and Py3k