Create/Update page flows fixes