Fix backaward compatability with targets and fuerte