More truncate tweaks