Fix calcore bugs continue