Fixes for primitive restart index stuff