Fixing up the spec