For ENG-6244, Fix some showstopper bugs to get unit tests running