Fixes to last nights regression
Merge pull request #262 from roydude/v1-train

Fixes to last nights regression