DFL fix + minor misc