FIX Several issues in decoding and building parts.