Fix few more errors