Bug fix and code violations.