More to be done before Rohingya return to Myanmar : UN