python fixes for 2.2.1