Minor build improvements
GDS-1275