beginning gerrit fixes