Review issues fixed