Minor merge fallouts
Merge pull request #151 from joakim-hove/merge-fallout

Minor merge fallouts