few small issues