Fix some minor issues in the previous commit