Fixes compression per 05 spec (work in progress)