Fixes some issues with enforcedRequest