Some few adjusts ...