Some more minor touchups