Solved some issues