Fixed some issues with the framework.