Further security refinements for 3.3.1