Misc fixes.
Merge branch 'master' of github.com:yahoo/mojito-waterfall