Added compatibility fixes