Will/opaque keys ora fixes

@dianakhuang