Fixes for Python EQ support