Correct some minor issues