Fixes from @sigurdteigen comments on #1485