Fix illegal accesses