more tweaks to work with TN