Associate InstructionalMaterials and Location with library unit, fix other small related issues