Fix a couple issues on page management

Fixes #959