certification bugs fixed