Skyfall support for smart warps too