Cross-borrowing no longer works
Fix vector indexing deprecation warnings