Solved minor issues