Fix crossroom stuff