Cleaned up some security issues