Added a couple of compatibility fixes