Fixed most specs