Little fixes for doMammothNode