CONN-1086: Fixed the build issues