more fixes on mui