fixed a small issues