Few bug fixes for Activity and Donations plugins