Update to latest onm v0.3.6