And more python fixes...