Kabam: minor fixes