#hash and Opal fixes