Fix a few things related to site pages

Fixes #131