Fixes on framework