small fixes to make all tests run