two minor bug fixes
Merge branch 'release/v0.4.35' into develop