Update some things before seeing about merging updates from work