Fixed some bits of the hub