Fix some broken references in plugin code.