Whatapp Plugin fixes by Buffi