More fixes for 64-bit SDK