Fix presubmit errors