minor compatibility fixes