Fixed review comments from Morten