Trying to get rid of security issues