Review comments fixed