Fixed many more compatability things