Fixes - all tests pass!