More File Library stabilisation updates