Minor changes to make test suite work