Fixing up some minor spec bugs