Fixed comment messages