Fix broken specs under Ruby HEAD