Framework build Fixes