fix some issues for certification