Fixies per gerrit comments