Fixed few small issues