Fix deprecation inside CORE