Fixes syntax and specs