Fixed some OOB read access bugs