Added some compatability changes