Fixing several specs. Not done, but still, this is improved.