Fix Core SDK v2.5.x compatibility