Fix these adplugin issues for better user experience

@iamjdk Yes this is things we should fix, I will look at this.