Fix some associative arrays