Framework: Fixes Part 6