Fixed peer review bugs