A few tweaks to make page feature ordering work correctly.