Onet - tweaks to make release-ready