Fixed errors causing more header errors breaking the plugin.