Fix further gerrit comments