Framework: RX: fix some compile issues