Fix few small issues