Found and fixed some compatibility issues.