Changes based on Aslak Hellesøy comments