Bugfixes to get tests passing