Fix various issues in support plugins