Minor workding tweaks