Minor fixes

The code usually uses __DMX_STORAGE_H.