Fixed some isses with plugin compatibility