fixed stuff to work with newest core plugin