Solving minor issues