Fixes for site removal