Small improvements for new Dwoo-Plugins