Fix two problems.  Tests now passing.