More fixes

We really really need some unit testing in the UI...