Fixed minor issues that got introduced after push to github.
Merge branch 'daily'