add_target_and_fix_bugs