Some issues fixed within the plugin core methods :)