Fixed some getdata stuff