Some small fixes.
Update to fix build issues not picked up by VS.