Testsuite failures and some easy fixes