* Various adjustments