Fix bug distingishing subscripted vars
Update libs