[Framework] Fixed compilation issues after upgrating framework
[Framework] Tweaks to framework settings