User deletion fixes