Fix a few broken specs
Follow up fixes missing from last commits