Fix an issue and remove some scar tissue
Merge branch 'master' into catch