Other few adjustments