Added more compatibility fixes.