fix few small issues