More fixes. I need an Uno for testing.