a few compatibillity changes