fixing a couple CS issues