some fixups so I could run the tests