Resolve some major violations