RCA, register and mux fixes