Minor updates to the framework.