Fixed FB warnings + Cosmetics