Added some more compatibility code