Fix these adplugin issues for better user experience

I submitted a fix here.