Framework: Fixes Part 3