Minor changes from Pontus comments