Fixes for OOB access