Page ref bug changes