Framework: Fixes Part 5