Certification banner related fixes