Some fixes for Rx error handling.