Fix page infrastructure