Fix faulty arrays definitions