Cleaned up venue+room patch