Opal 0.6.2 compatibility fixes