More minor fixes
Merge branch 'master' of github.com:mikkelam/D502e13