Merge review fixes

JIRA: https://jira.ez.no/browse/EZP-22106

Cherry pick of commits from #35 that can be merged right now.

come on Travis and @ezrobot, I'm sure you'll find something :-)