Incorporated comments from Jouni.