PHASE 2: Security adjustments.