Reader bugs fixes