ReviewController fixes