Fixes which get the tests passing again