Updates to primitive wrapper handling