Fix spec suite errors