Some minor tweak