intptr datashape fixes