I fixed some other cross compatibility issues