mux fixes