[Plugin] Some fixes by rlindner81