Project wide CS fix / small improvements