Fixes re: previous merge commit for paging maps