FIX: Compile error
FIX: Suboptimal lengths for some re-scaled locomotives