more fixes during framework build (not working)