Fix apiary reported errors