Fix for CS issues in build 1349