Some additinal adjustments