Fix most of the final violations