Function Manager: fixed some more deletion cases