Code warnings cleanup 2nd phase