Fix some cosmetic issues