Some bugfixes in the files for the DM4.1 build.