small fixes to make all original tests pass