Fix opf saving namespace issues