RX Fixes and cleanup