Fixing some spec bugs