Fixed all of the issues I caused previously

(Plus a compatability field)