Fix remarks
Merge pull request #43 from vatseek/7747

Fix remarks 7747 7750 7748 7746