fix some violations