Fix inconsistencies in specs