A few small adjustments