Merged some fixes from c0ffee's silc-plugin.