Adds more compatibility fixes