more 4.x compatibility stuff that i forgot to commit