Fixes for Cantina and road-generation