Minor compatibility fixes