Fix some example issues with new architecture.