Some tweaks to tamed Thomas