Update dependencies and bump to 2.4