More fixes to Pythony stuff