Took care of the weaker security issues.