Fix ordering in set check for fw_config. Also make code more streamlined.