Minor workflow improvements