Fix the breakages introduced by amaya, Daniel
28 files changed