Fixing some cosmetic stuff