Bug fixes to fix a failed test.