Certification bugs

Changes were made to fix certification issues.