Attempted Jenkins Violations Fixes