Entity Access Fixes