Partial fix for Rail x Rail and El-Rail x El-Rail issues.