Fix issues with CSE paging macros