Fixes for delayed removes