v4.3 fixes
Merge pull request #406 from takeit/v4.3

v4.3 fixes