Fix truncation errors and specs