Code warnings cleanup 3rd phase