Builder: fix passing cli targets with spaces / arguments