Fix some violations of coding rules compliance