A few adjustments to previous commit