Various fixes
Merge branch 'bleeding' of https://github.com/svkampen/James into bleeding