Minor fixes to make testsuite happy