Fixed thiings after comments from kjetil