Fix directory issue with multiple fw_depends