SERVER-8752 #4 Fixes and modifications