ERT-530: Minor fallout after merge.
Merge pull request #437 from joakim-hove/ERT-530-fallout

ERT-530: Minor fallout after merge.