Clean up of Issues and made Issues compliant with NIST.