More nmake fixes