Some truncation fixes