Resolve common issues with transfer