Fix small issues with plugin