Framework: Fix and upgrade