Review nagger fixes