Fix some bugs auto-pruning old BE's