Page api fixes