Better plugin checks