More dfb-related changes.