Fixed stuffs to account for the new CoreHA