Build issues fixed.