Add some updates to keep env up-to-date