Style cop warnings fix