small ON fixes
ON fixes