More compatability fixes (woo!)