fixes BSONStorage handling of a null map
tweaks for API update drift