Solved some minor issues