More work for Juce migration, random stuff