Fixed new cosmetic bugs