Various touchups.