[WIP] fix for Win64 codegen