More virtual tour fixes