Fixes for Recipient File Loading