Some fixes from the prettifying...