Fixes by hounci violations