Fixed OsMo plugin issues