Fixes by oni-link