Fixing several specs