Fix some errors for new version.