Opal compatibility fixes