Fixed a numbers of errors in the framework.