Fix some cosmetics