Some minor fixups, but the library mangling still doesn't work