Fix apiary syntax issues