Fix Core Library