Fixed regressions after merge
Fixed security files