Adjustments made to build with new frameworks