Fixed certain data managment errors