Correct minor issues