Update compatibility w/ 4.0