Fixed few violations

KAA team