Fixing almost all the specs