Fix a few issues with multiple GBs on a page