Fix issues that were identified during code review

The Code convergence workgroup identified multiple minor fixes that are
now fixed by Bhaskar.

Also reverted DOLRO back to the original implementation.