Framework: Fixes Part 2