Some beauty fixes.