[PATCH] Some page migration fixups