Fixed cosmetic bugs