(Salamander) Fix Salamander targets