Some consistency fixes
auto-merge staging into master