Fixing includes.  Missing MultipleObjectsReturnedException in some files.