Make sure we trim in all the right places