Fixed shared violation issues.