Compatiblity changes for 2.4