changing back to c + build fixes