Updates necessary to get us to a working state