Added DISABLE_... options