16 Fix spec messages