Fix some zero-index things