Fix a few asthetic bugs.