Minor updates to various plugins