A few more compatibility updates