Fixes System add bypass/tweakings