Small fixes/improvements
Small plugins update