Additional page move cleanup

Dealing with some small issues that popped up in further spot-testing.