More small adjustments