More village gen fixes.