Fixed all compatability issues