last minute fixes
Merge branch 'Jonte'