CS Fixes From StyleCI