Some minor fixes for the framework