some more uno fixes