Fixed some ordering issues with dlf.hpp