Solved some little issues