Fixes for MultipleObjectsReturned.