Making cluster and hardcore options work better together