Minor patches.
Merge branch 'master' of https://github.com/wright7/Wari