Some bugfixes to get the tests running