A few adjustments