Fix further compatability issues