fixes - so several unit tests pass