Fixes to Patrik's comments