Framework: Fixes Part 4