A few more compatibility issues