A few compatibility updates