Some fixes found after wrapping up the tests suites