More disabmiguations

I apologize, this should have gone with #4199