Fixing review bugs