Enable the shard builder, bug fixes