CS Fixes to please Scrutinizer ;)