Fixing some issues with the framework.