A few more older python fixes