Last fixes coming from the google-internal library