Fixes & kitchen tests.