Fixes #4131: Security adjustments