Some more fixes from the prettifying...