Fix bugs with separate RE3/RM3 builds not picking up Rx3 changes