Important fixes for CAB stuff