Small fixes for the framework