Some aesthetic fixes