A few future compatibility fixes