Fix problems with targets.