Update to support x32