Updates for onosys style.