Another minor tweak
More fixes