WL-3501 Fix bugs from wl-ck-plugins fix-oxitems branch