Fixes last two test failures!