CONN-892: Fixing issues with build.