GDS-1178 Minor changes in build