Some additional adjustments