Fixed some minor issues on WhatsApp