more fixes for older plugins