Misc minor tweak of fix.