Fixed problems covered by current tests.