Fix remaining broken specs