Critical fixes for preserving sender references