Assorted bugfixes in object file handling: