Applying small fixes to the framework