Fix integration issues and pull back in endorsements.