backwards compatibility fixes