Minor fixes to remove a warning, and fix last test.