Fixes #388
Fixes #393

Not the name change: output_page