Fixes for addresses in 32-bytes.