Fixed several violations