Little contrib

Little improvements for the framework.