Small code fixes
Merge branch 'linnea'