Fixed few things following prod release
Merge branch 'master' of https://github.com/nicholac/timestreams