Fixed stuffs with respect to the new CoreHA