Some leftover adjustments