Different fixes after automatic checks

same as my previous line-comment