more fixes for guild leaving