Fixes to the framework.