Fixing optimizers, disabling internal calls