Fixes to framework.