Implement reviews fixes