Rail dataset fixes.