Updates to canberra plugin.