fix endianess; update fixups handling