More fixes for Page type fields