Fix broken specs reported in #4