1. Other bug fixes and transfer optimizations