Adjustments

Other minor adjustments