Fix presubmit failures