Build issues fixed