Fix few small errors