CRA-534: Fixed some small bugs.
Merge pull request #52 from gudmund-hermansen/master

CRA-534: Fixed some small bugs.