DR1 Stabalization fixes

See commits for individual fixes. DR1 stability fixes.