Few bug fixes in read part