Fix issues with new idea changes.