Fixing optimizers, disabling internal calls (2)