Add some things that were missing but were required by unit tests