Framework: Fixes Part 1