final refinements for 0.3.930.1