Fixes; added data and uintptr types