DFStorage minor improvements