Update & compatability fix attempt