A collections of fixes to make the test suite pass again