Fixing Johan comments