Should fix deprecated stuff being around