Disabling only what is needed for NYX

Disabled too much in last commit