minor upstream update