Catch more places, fix some truncating