Quick fixes for Python 3, still need to fix Plugins though