Using DISABLE_ macros in some missing places