Tweaks to recent commits
Python parity for features in 1.3.5