Fix up Salamander