Fix couple refs/labels