Minor changes to get all tests working.