More aesthetic fixes