More work for juce migration