small upstream changes