enda mer fixes