Resto shaman fixes