Fixed typos and fix for env without updated wire lib