FIX: Py3k warnings