Some fixes from the last test.