Several adjustments

Several adjustments