Adminotech core fixes pt. 8