utils fix
some fixes