More fixes for classes not in Kitchen context