Solved the minor issues