More presubmit fixes