Fix tour bugs