Small fixes. Guilds support