more build issues fixed