Bring in various changes from local machines