Fixed merge deprecation warnings.