More hanging fixes