Fixing checks - was failing also with no CS failures
CS fixes to make builds pass