Fixing bugs in the spec