Some tweaks to tuntu.