clean up a few things and ensure we can page forward