[00001m] Some minor adjustments