Minor fixes for MSDOS build to track latest changes.