GDS-1084 Minor changes