Solving minor issues.