couple minor tweak