Various improvements
Pacer test suite is green