Minor misc. fixes
Fixed a few test flakes...
Merge branch 'dev'