more fixes
Merge branch 'railhelp' into testing