Solved some minor issue