[MERGE] Fixing errors found with ReviewBoard integration