Various updates to cope with developments in gems we depend on.