Re-enable centres, fix a couple of bugs