Fix some spec bugs.