Bug fixes(fb and notification certificates)