strict compatibility fixes