Bootstrap Tour related fixes