Small changes to get things working again.
Merge branch 'master' of https://github.com/squiffy/masochist