Even more compatibility changes