Fix additional index errors