Small changes and a bug fix for custom pages.