Build fix for marshalRaw refactor