Some fixes and enhancements to forced eviction