~ plugin & pluginable fixes