Kabam: minor fixes
Merge branch 'jon' into sprint7