Frameworks: Fix conflicts