fixup code violations