More presubmit fixes
Almost presubmit clean