Surely the letter-count refer to the answer to the clue rather than the entry to go in the grid? I spent ages trying to make 21d into a 7-letter word, and it was only on seeing germy's post that it made sense, but I still think it's wrong of the setter to do it that way.
Also, has anyone else got the same word twice for 25d?