Fixed some spec failures