Cperello/ocpf fixes

Several fixes related with ocpf import / export