Handle the target/targets issue for clients as well