Security improvements (issue #3256)