More fixes, mostly cosmetic