Try to fix signatures (not done)