More aesthetic fixes.