Update to use newer and maintained packages