Override fixes

Fixes issues with overrides. Slower than it should be because I had to disable .par because of instability issues (synchronization)