Fixes to cabin