Added truncate message, fixed return codes, backport