Add support for x32