Various small fixes to the Cattery, should pass the automated tests now.