Violation Fixes