Framework Fixes