Changed various datatables to correct values