Core; compatibility with snow fixes