Fix various bugs in Tours module