Fix p2sh address generation