Tuga fixes