Some minor touchups